Skip to content

ENT-12724: Added this.calling_bundle variable#5984

Merged
olehermanse merged 2 commits intocfengine:masterfrom
victormlg:calling_bundle
Dec 30, 2025
Merged

ENT-12724: Added this.calling_bundle variable#5984
olehermanse merged 2 commits intocfengine:masterfrom
victormlg:calling_bundle

Conversation

@victormlg
Copy link
Contributor

@victormlg victormlg commented Dec 5, 2025 •
edited
Loading

@victormlg victormlg force-pushed the calling_bundle branch 3 times, most recently from 85d068f to 8410fcf Compare December 8, 2025 08:17
larsewi
larsewi requested changes Dec 8, 2025
View reviewed changes
Copy link
Contributor

@larsewi larsewi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise, LGTM 🚀

@victormlg victormlg requested a review from larsewi December 8, 2025 18:05
larsewi
larsewi requested changes Dec 9, 2025
View reviewed changes
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 18, 2025
View reviewed changes
cf-agent/verify_methods.c
BundleBanner(bp, args);
EvalContextSetBundleArgs(ctx, args);
EvalContextStackPushBundleFrame(ctx, bp, args, a->inherit);
EvalContextStackPushBundleFrame(ctx, bp, args, a->inherit, PromiseGetBundle(pp));

Check notice

Code scanning / CodeQL

Pointer argument is dereferenced without checking for NULL Note

Parameter a in VerifyMethod() is dereferenced without an explicit null-check
@victormlg victormlg force-pushed the calling_bundle branch 2 times, most recently from 0928a30 to b16e697 Compare December 18, 2025 13:13
@victormlg victormlg requested a review from larsewi December 18, 2025 13:54
larsewi
larsewi approved these changes Dec 19, 2025
View reviewed changes
Copy link
Contributor

@larsewi larsewi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@larsewi
Copy link
Contributor

larsewi commented Dec 19, 2025

Looks like there are some conflicts with the master branch

@victormlg
Added this.calling_bundle variable
1fb7b79 
Ticket: ENT-12724
Signed-off-by: Victor Moene <victor.moene@northern.tech>
@victormlg
Added test for calling_bundle
ab724ef 
Signed-off-by: Victor Moene <victor.moene@northern.tech>
@victormlg victormlg requested a review from larsewi December 19, 2025 11:45
@larsewi
Copy link
Contributor

larsewi commented Dec 19, 2025

@cf-bottom Jenkins please :)

@cf-bottom
Copy link

cf-bottom commented Dec 19, 2025

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/13239/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13239/

@larsewi
Copy link
Contributor

larsewi commented Dec 19, 2025 

14:36:58 compliance_log_test.c: In function ‘test_serialize_deserialize’:
14:36:58 compliance_log_test.c:52:5: error: too few arguments to function ‘EvalContextStackPushBundleFrame’
14:36:58      EvalContextStackPushBundleFrame(ctx, bp, NULL, false);
14:36:58      ^
14:36:58 In file included from compliance_log_test.c:4:0:
14:36:58 /home/jenkins/workspace/testing-pr/label/PACKAGES_x86_64_linux_redhat_7/enterprise/../core/libpromises/eval_context.h:191:6: note: declared here
14:36:58  void EvalContextStackPushBundleFrame(EvalContext *ctx, const Bundle *owner, const Rlist *args, bool inherits_previous, const Bundle *calling_bundle);
14:36:58       ^
14:36:58 gmake[3]: *** [compliance_log_test.o] Error 1

@victormlg
Copy link
Contributor Author

victormlg commented Dec 22, 2025

@cf-bottom Jenkins please :)

@cf-bottom
Copy link

cf-bottom commented Dec 22, 2025

Alright, I triggered a build:

Build Status

Jenkins: https://ci.cfengine.com/job/pr-pipeline/13242/

Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-13242/

@larsewi
Copy link
Contributor

larsewi commented Dec 22, 2025

@olehermanse merge before of after release?

@olehermanse
Copy link
Member

olehermanse commented Dec 22, 2025

@larsewi are the test failures unrelated?

@larsewi
Copy link
Contributor

larsewi commented Dec 23, 2025 •
edited by atlassian bot
Loading

@olehermanse yes, this and other builds seem to get stuck on dpkg prompt asking what do do with a changed PHP config file. See ENT-13235

@olehermanse olehermanse merged commit ddc57ce into cfengine:master Dec 30, 2025
46 of 49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@craigcomstock craigcomstock craigcomstock approved these changes

@larsewi larsewi larsewi approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@victormlg @larsewi @cf-bottom @olehermanse @craigcomstock

Comments